Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:57 +0000 (18:13 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:57 +0000 (18:13 -0400)

Trivial merge